Bugfixing, lastFM changes