Minor changes

So can we merge this?