Added a few last missing things