Fix bugs with new buses coming in
Fix merge