I'd have put up a PR with my fixes but I'm super swamped right now with firefighting shit