Fixed variable map problems.