Hammerhead: All kinds of fixes and shit

Change-Id: I945975a8b9eb1ef41ecec54240c14a3dc70410b8