Sync latest bug fixes