Patch merges

various fixes from local testing and dev@oe-lite.org