Trying to fix a couple linking bugs