Various patient selection fixes.