Issue #51, #59, #60.