Linking errors fixed