Improve poorly specified callbacks