Some changes to make future work easier.  Creative tabs are broken for now...