Fixing some miscellaneous stupidity