random fixes before deployment