Fixes related to #13