Some stuff missing from previous commit