Fix for roster updates and more lenient roster entries #302