Updates and fixes: Round 2