Some zoned fixes