- small fixes in module loading