Some fixes on some missing output....