More resolution fixes