Support nodular profiles; misc fixes.