Minor fixes for issues resulting from recent architectural overhaul
Merge pull request #405 from jorgesilva/develop

Minor fixes for issues resulting from recent architectural overhaul