fixed remaining rb299 issues