Fix graphics
More fixes