Fix #685, Fix #677

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