Changes from kotlin-web-demo original repo. Bug fixing