More bug fixes for 1.10