some fixes for buggy web