Performance fixes! :)