Some important but critical fixes