Fixes some issues in v1.1