Fixed bug and extended server time out for debugging