Workaround spec failures