Few fixes and clean up