Various additional hacks to get image annotation demo-ready