Fixed build issues introduced in last commit.