Other small cleanup