Bug fix (non-shared release caused and code cleanup.