Fix compiler style warnings