Small fixes in variable space reservation