Fixing more compilation errors (hate making edits on Github sometimes :P)