Some fixes #2