Fix some minor issues for #14