cell entry fixes