Fixes! for the bar