feature/491: fixing reported errors.