some fixes maybe