Try some fixes