Continuing to update to more recent snapshot
More updates to latest snapshot, and fixes