A bit of fixing up, but mostly Coast-specific things.