fix more GNUisms