Another bugfix edition