minor fixies