Performance improvements

From review comments by Beanz.