add some fixes