Fixes of most reviews