fixes + implement new code path in base raw