more numeric fixes