final fixes for new bte integration