Trim
Small fixes