Couple other tweaks

Some minor tweaks to get the rest of the repo compiled