Attempt some fixes 2