Fixed some stuff getting leaked out