Fix a few issues related to forced spectrum fitting