Damn, forgot to commit these...
Merge pull request #3004 from Kingcom/StatusBar

Windows buildfix