Fixes for problems with default. Should be done.
Merge branch 'kyle'