Couple more fixes

Would be nice if there was some place I could note down a changelog of everything I've done for SWMH, for completeness sake once the update is released