A few updates for bug fixes?