Further Fixes

lol