Minor tweaks + Kibana logging