Fixes.

Closes #185 and #186.