PillowScript fixes