Fix kick and cloak