EnderCommandKill bug fixes