Fixed issues with multiply defined symbols.