Some miscelaneous changes