A few small tweaks that reflect the tweaks made for 52N