Fixing error in property lookup and disabling live switching as part of refactor