Fixing Caret issues