Push bug fixes