Fix bunch of compile errors.. Currently 44% compilation