Last fixes due to review