Basic fixes for mobile server