Fixed more

Fixed more