Fix #748, Fix #746

Signed-off-by: Ross Allan <rallanpcl@gmail.com>