Updates for #300 and #359