Logs & fixes