Manually fixed linker warnings