20548 More Google PHP Library tweaks