More fixes for require handler