Some things fixed for the base