Dynamic var tweaks