more fixes for basic scenarios