Fix alignment and close an #ifdef