Fixed: Core project build issues