Some organizational fixes.