Fixes for diplom project