Minor constants improvements