Make file fixes