Some more numeric + hex fixes