Various fixes from wooc