Bug fixes. A lot of them