some fixes .