Fix some build configurations after r264389