More fun Hawk fixes