Zebra - Fixes as discussed in the diff with @nschonni