Update build settings, fix logging