Penlift fixes