Remap when needed (for compatibility), ASM improvements, adjust source of samples