Improve logs in engine code