Fixes for servlet monopoly