Fixes for non-working defs and data