(!) Fix: Minor bug related to Web(!) Fix: Some Bugs