Little fix and some safety precautions.