Final tweaks (hopefully)