Fixes for playlist