Fixes for mixing into prototypes
0.1.0