Build fixes, updated dev deps