Pull bug fixes