Puppy script fixes