More fixes

bombs yay