Fixes for failing junits.