Bug #1: some fixes (firsyura)