Fixes for previous merge