Fixing more errors caused by PR...