Dynamic view fixes