Fixing up silly mistakes that I hate refixing