Small speed fixes