Fixes some issues in the Squire plugin