Fixes to some things that have changed since the original Photohunt
release.