few other fixes