Fixed Trim Issues