Prep fixes

@StorkHQ/owners - @stoodder I think I'm getting closer????