some minor fixes FF