Fixing missing code issues

Follow