Fix rogue deallocs + cleanup warnings