Fixes for MacPorts.