Fix #630, Fix #579

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