Pushing some minor fixes