Some fixes after IDEA inspect code