organizational fixes to easy problems