Fixed some broken build