Tb colorspaces fix

These are fixes we worked on at my desk.