Fix the following errors