More bug fixes for 1.9.3