Fixed Site Manager Issues