Fixed more trimming issues