wrap bug fixes + looser restrictions on mixin annotations