fixes for loading modules