Bug fixes for bart compatibility layer.