Display setup fixes