Commit with small changes to fix synching