UnsupportedOperation errors

This should resolve #1504.