Fixes for later testing