Rev 5 Small fixes