More fragment improvements