Fixes for issues #132, #135, #146