Kick fixes