Minor source files fixes