Small corrections to improve codebase in general