Some tidy ups and static support