some small fixes to improve compliance.