Update output to reflect recent bugfixes