apply fixes from Nimbusbase