Various updates made after upgrade to 3.7

Signed-off-by: Warren Clarke <wclarke1@gmail.com>