More fixing stupid crap I should've tested a million times.