Trying to make fixes