Bug fixes! :)