Some fixes for reducing NPath complexity