Fix some errors that shouldn't have existed to start with...