Just a minor fixes