Updated small changes that were created after merge