Fixes to RAG colouring