Small fixes to server booking and android app