Fixed more codes