Small touchups
Fix crash reported by captain42