Some fixes for assessment workflow..