Add -O2 to old Makefile. Fix relevant warnings.