Fixed the same minor bugs regarding the version without syncronization protocols