Fixes for opening assistant