These last to changes are lint cleanup, I guess