Minor changes - preperations for update