Fixed several issues and bugs in ISO management