More retina fixes