Changed type of safehaven variables