Fix various style issues