Various fixes and improvements according to discovered service problems.