Minor changes to prevent text from being trimmed