STweaks: Small fixes.