Include some changes missing from last commit and use old hash syntax