Retina bug fixes. #Addressing issue #17