Bunch of fixes/breaks