several fixes for frames