new fixes for require