Fixes for back button