Sample app updates per motion-require fixes