Bug fixes for shouldjs