Minor organizational fixes