Fix up kick stuff