Small organizational fixes