Final bug fixes. (for now)