Fix building issues from previous commit