0.4 bugfixes, butterfly bug remains