Provide some fixes for #609