Cobalt mods

Cobalt fix mods

Everything filed under fix by its own author, ordered by how much it is used.