Bugfixes around trying to set up the frame, still broken :-/