Basic fixes to source