Fix issues according to review feedback