#6494: Fixing issues