Fixed compile issues due to my reverts... I'm really not doing so good today :/