Fixing the issues introduced in the process of merging the changes from public