Some changes for squiggle and fixing the build