bub fixes