Fixed the latest issues