Various fixes for Sparrow