admin setup fixes