more critical fixes