Fix some more stuff via @iamEAP