Bug fixes

Fixed a problem that was causing conflicts in 2 modules with the same
function name.