Fix most of the current issues