Various fixes and neat hash sync things