Misc. and fix for issue #24