some minimal fixes