Fixes for faster server