Fix some ownership issues

Still not compiling due to errors with unique_ptr in Sprite...