Fixed other warning/linking issues