More double-free fixes..