Some minor changes that might help with unity importing, if we're lucky