Quick Fix before Merge

Fixing a few things that were breaking...