Some fixes due to IntelliJ + progress with instructions implementation.