Quick patches for #9, #12, #14