fixes for fast modes