small fixes in hammydatad