Bug fixes - mmore work on debian 6