Fixed issues with cbuilder's load output.