Fixing some more residual problems