Combat fixes for the occasional exception when reloading