Fix the build + 2 minor fixes

Don't use addprefix, list the entire sources here. Separate each with a newline.