Additional fixes for #2.