Added some missing bits for previous commit