Various fixes to keep up with head