More Fixes! YAY