- Fixed linker bugs