Minor swoop fixes