cosmetic fixes for moving into new repo