Fixed setup build errors