Fix build issues introduced in last commit