Enforce type defaults
Remove MySQL specific code
Swap merge order
0.3.11