Composer corrections and proper source relocations