Fixes from code reiview.