Fixes to fulfill remarks.