The oh so interesting bug fixes