Fix/#55 #56 modules

Fixes for problems related to modules.