Few fixes and fine tunings