Bugfixes for hat and kick