Fixed building issues.