Various fixes for making Ice work on GNU/Linux with recent master changes.

Some of your new commits broke the GNU/Linux support, but it should be fixed now.