Service venue and some other minor changes