Fixed signatures to be correct