Fixed more variable highlighting terribleness