Fixed build issues from the merge with Daniel.