Fix yet more issues.  Yet still not working.