fix potential problems and speed up access to composite update-site