Lint fixes (sim references as this)