Bug fixes aaaaaaaaa