Fixes Custom settings for Amigo #182
Ninja warning fix