Fixes for puppy script