critical fixes