Vision fixes