Misc updates to Makefile and nacelle