Obscure bug fixes which fixes a surprising amount of bugs