Bug fixes.
 -Erik
19 files changed