Fixed more features