Fixed errors after rebasing.