f minor fixes