More minor updates