Few minur fixes