Monor errors fixed