Bug fixes! Rejoice!