Fix Makefile targets and RPM building