improve portability of some templates on Mac OS X