critical fixes etc