Some stripe fixes + cleanup