MOAR FIXES TO TRIM