fix some issues with module path and constants