Trying some fixes