same as and other fixes