Non happy-path fixes