Fixed some issues that resulted in erroneous duplicate symbol error messages.