some final fixes, should be good on centos7 now