minimal changes to improve portability of make