Fix StyleCheck warnings