Basic fixes