Taking (incorrectly formatted? :-) ) patches from Tim for building the slides