More changes to get back to compatible FML version. Should fix ID issues.