Minor fixes EX5