F-f-f-fixes