Trying to fix a few thigns