Minor improvements

Improved servlet performance