Fix #748, Fix #746Signed-off-by: Ross Allan <[email protected]> (commit: 74bcede)
Fix #751Signed-off-by: Ross Allan <[email protected]> (commit: dc1ef27)