Additional colorization fixes (VOLDEV-36)