Entry one fixes