Another round of fixes for squirrel