streetcar fixes