More Fixes. Yayyy down to 474 errors!