Fixing more garbage