Small fixes/tidy-up. Still type issues in actions.