Bugfixes for RGB+W