Fixes for previous updates