Various fixes
Some deliverables stuff
Merge remote-tracking branch 'origin/deliverables'