Some fixes. Might actually now get BSL version.