Fixed trace statements