Minor things fixed