Fixed it.
When I first upgraded, I got the missing thumbnails error so I restored the 'photos' table as suggested in another thread. Reading the upgrade.php script, it seems like new fields have been added to the 'photos' table as well as new indices. I manually added them using phpmyadmin, and it fixed it.
Thanks anyway.