Minor changes to fix possiible linking issues in Linux.