Merge
Some more fixes to source