Bug fixes with refunds