Rev 107

Minor fixes