Some smaller updates