Fixes build requirements as well as replaced API