Various fixes for PR #26
Various fixes for PR #26

jburel/presentations,ome/presentations,sbesson/presentations,jburel/presentations,sbesson/presentations,sbesson/presentations,ome/presentations,will-moore/presentations,jburel/presentations,will-moore/presentations,will-moore/presentations,ome/presentations