Bugfix and feature add for delay accounting stuff