Basic fixes.