A large batch of updates

Signed-off-by: David Scott <dave.scott@eu.citrix.com>