Fixed all build errors