Some fixes around fm::Time