Fixed message error and improved module compilation cleanup