Fix build after master merge