Solve code issues