Amend previous commit, fix build