Some fixes in order to support business notebooks