Fix build pt 2