Fix strict_variables issues