Some things fixed