Fixed all easy-to-fix issues