Bug fixes following site crash