Release 0.8.5: Minor fixes