minimal fixes