Goodnight tweaks