Updated dist files and few misc fixes