fixes for usage on ubuntu with system-wide tools