Some cleanups and fixes about PeterPan