Bugfixes

Two small changes to fix bugs I have encountered while preparing today's demo.

@Schoonology please review.