Fixed Google Bugs, had to remove due to linker error