FIxes for extra vars