Compile fixes for Debian 3.1 (gcc 3.3)