Fixes for nova element changes.