some minor fixings