Move recent bug fixes into live branch