Fix issues that some people introduced ^^