Minor bugfixes; addition of --no-iso build option