Additional fixes for #453 and #473.