Fix some changes that snuck in while debugging