Fix #840
Fix #838
Fix #837
Fix #836
Less debug noise