Some menor fixes