Final Fixes

Ugh