The last bit of bug fixes