Puragtory fixes