more fixes to source