- Fixes for issues found by stef

more efforts to start supporting it properly.
- Minor fix for instant test