small bugs for 1.8.5