Final tweaks for now