Fix the following issues before continuing