Fixed more problems