Fixed impl signatures