Makefile tweaks and handling of function overriding