FOOB-14 fixing things