A few fixes for stability - lots to do on Monday