Some fixes / feature prior to plane trip