Simple updates mostly to common.py