Small fixes to Frame