Fixes! Yay!