Fix lazy switching issues