fixing things for FFOS