Fixing some janitor stuff