Fixes due to #41