Some fixes #108