WIP: Build fixes