Minor fixes

Some improvements for convenient work in IDE