couple of Raw bugfixes and cosmetic changes