various london demo related changes