rbb warnings fixed