I'll be PRing something shortly that should solve a chunk of these issues :wink: