v1.0.4: Fix definitions