Experimental Branch: Miscellanous compile fixes

These are a couple modifications I had to make to the Experimental branch to get it to compile with my project--After that I'm having a crash issue, but I'm going to file a separate issue for that.