Fix missing definitions
