Fixes for --inst-max-level