Few fixes and updates