Peter - 2008-08-12

Few fixes