Fix some sync issues + update for changed system