bug/latest_broken

A couple of bugs discoveried in the final testing