Add missing things from previous commits