Add some missing things...