Fixing some issues with Straat.