Some fixes, related to #3