Remove warning and cosmetic fixes