EBB bugs fixed