Some last-minute tweaks and stuff