Fix some style warnings