Fixed some leaks.. Re-added conform thingy