Various / minor performance changes