small fix everywhere