Few dynamic var tweaks for BS2 support