Slight fixes to motion and music library