more fixes for easy installation on gnu systems