Tweak Makefile and viewer.cc