Generic fixes on Frame code.