Inline with working version in gearbox
Fix warnings
Fixes an overloaded virtual function warning