Case selection typos and other cleanups