Improved forecast time retrieval

Other minor changes