Fixed compiler errors
Merge remote-tracking branch 'origin/jk-5' into Lordmau5