Chasing HEAD

Bunch of stuff that needs to be updated for core changes :)