Fixes for Motivate