Minor fixes

Oh god I hope the S3 fix doesnt fuck over someone else