A few fixes.
Fix some stuff.