CORE: Fixed a few coding errors with various modules