Minor changes regarding FST serialisation upgrade