Debian Squeeze fixes