Fix current issues