Fixes for The Veronica Test (props to @veronism)