More plug.dj fixes