Fixes on ISO rendering