More attempted toolbar fixes