Submitting some longstanding yet unsubmitted tweaks