Fixes the linking problems