Fixes for fib and image zone when editing