Several small corrections/fixes