Minor code cleanups - left from previous patches