Fixes for zebraness
Merge branch 'fix/zebras'