Fixed FMSDrawer errors