Fixes for previous