Fix some missing