Fix #593
Fix #589
Fix #616