more fixes, for demonstration