Fix compiler warnings

Looks like this branch is behind upstream's master. The only new commit here is: https://github.com/dorkster/flare-engine/commit/cfa7ff6ae8bdf36d2d1f2aae6775db6e318a10da