Fixing up for dynamic resolution