!B fixes for running