Few fixes and additions