FF os fixes - still a work in progress (FF OS is really buggy)