Bugfixes for song display