Fixed sync issues from last commit