Increase bucket precision, fix entry validation