Little minor fixes