And some mandatory small tweaks