Fix build issues?