Few fixes and cleanup