Some fixes based on reviews