Assorted fixed from Pedro