More obvious runtime errors fixed.