Fix remaining issues with indirect colors [Alex Jackson]