Fixes for missing build dependencies