Fix the missing items from initial public commit