Some fixes #22