Last-minute panic tweaks :)