A few more TODO items