Hound/Joe style fixes