Fix friction issues

Fixes #15