Minor fixes
Version 2.09