ticket:25 Small fixes to clarify things