Build fixed. See last commit.