More retina fixes (tested on a Mac!)