Minor bug fixes and client requirements