Pen fixes