Some minor updates, mainly object pruning