Final tweaks (for now)