Fixes for require dependencies