Should be the last of the bug fixes