Some fixes (review)