small fixes, not ready to pull for 1.02