Fixed issues according to Daniil's comments