Fixing linking issues