Fix some style issues found by inspector