minor fixeds