Updates and fixes for removed functionality