Some fixes #1