Fixes for 2.1.4

Fixes #31
Fixes #32