Some minor execution time fixes