Fix linker errors
Fix compiler errors