Couple fixes for small errors when running with no Programmables.