Fixes #33
Fixes #31.

Build before serving.