Fixed two more bugs.
Merge branch '1.0.4b'