A few fixes to source files