fixes for blekhman-server1