Fixing codo issues