Fixup warnings and get requires in order.