bug fixes for rb299 support