[RB] Fix for bugs