Fixes for multitab