* Bug fixes in some modules

    - TODO: fix and test the rest tools for build process