Standardize callback and fix merge issues with dev.