Log trace + minor changes