Fix #548, fix #540

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