fixes for debian 7.5
merge