Work on some fixes