Thanks to @brandont-r7 for catching the last of the issues