Fixed memory fuckups