Fixed some issues with memory leaks, specificly into builder controller