Update to Penthouse 0.2.5 to addr raised issues