Updated limitations

Fixes #683