More WebApollo updates