Fixes for requiring