1.8 preperations

Update for UUID + some fixes, see individual commits.