Fixed bugs in site creation/maintenance