some usch fixes