Fixing more problems