some fixes for bazooka