PIE edits and QS Fix